blanket replace of xstrdup(QString.toUtf8().data()) to avoid potential deep copies.

diff --git a/gpsbabel/an1.cc b/gpsbabel/an1.cc
index 2b6b5548290add47a94e984866f847ad52251182..6ce63cb056ca54815536d1328f176f15ae6ac21f 100644 (file)
--- a/gpsbabel/an1.cc
+++ b/gpsbabel/an1.cc
@@ -814,14 +814,14 @@ Write_One_AN1_Waypoint(const Waypoint* wpt)
 
   if (rec->type == 0x12) {    /* image */
     if (wpt->icon_descr.contains(":\\")) {
-      rec->image_name = xstrdup(wpt->icon_descr.toUtf8().data());
+      rec->image_name = xstrdup(CSTR(wpt->icon_descr));
       rec->height = -244;
       rec->width = -1;
     }
   }
   if (!rec->image_name && !wpt->icon_descr.isNull()) {
 // FIXME: WTH?
-    char* t = xstrdup(wpt->icon_descr.toUtf8().data());
+    char* t = xstrdup(CSTR(wpt->icon_descr));
     FindIconByName(t, &rec->guid);
     xfree(t);
   }

diff --git a/gpsbabel/cet_util.cc b/gpsbabel/cet_util.cc
index 3122b9a9b7916ff8a7e06b2d84328c7909839065..e357287e347d6677f370335848b379d7787cd023 100644 (file)
--- a/gpsbabel/cet_util.cc
+++ b/gpsbabel/cet_util.cc
@@ -423,7 +423,7 @@ cet_convert_string(const QString& str)
   // FIXME: this is really weird.  Since cet_convert_string wants to free
   // its argument (!) we make a duplicate just to satisfy that kind of goofy
   // requirement.
-  return cet_convert_string(xstrdup(str.toUtf8().data()));
+  return cet_convert_string(xstrdup(CSTR(str)));
 }
 
 /* cet_convert_waypt: internal used within cet_convert_strings process */

diff --git a/gpsbabel/gbfile.cc b/gpsbabel/gbfile.cc
index 7a05780c714a9a395dcc7484afefe61d4197d6f2..c6d5c9d443b86a1ba5e5e8dc735aa60983ba6b23 100644 (file)
--- a/gpsbabel/gbfile.cc
+++ b/gpsbabel/gbfile.cc
@@ -1272,7 +1272,7 @@ gbfputpstr(const char* s, gbfile* file)
 int
 gbfputpstr(const QString& s, gbfile* file)
 {
-  const char* t = xstrdup(s.toUtf8().data());
+  const char* t = xstrdup(CSTR(s));
   int r = gbfputpstr(t, file);
   xfree(t);
   return r;

diff --git a/gpsbabel/gpx.cc b/gpsbabel/gpx.cc
index 5030f33046495d7fdafa2fcd88204c55823f31f0..a991785db03ca17495de9274587a7eb44d1cb29f 100644 (file)
--- a/gpsbabel/gpx.cc
+++ b/gpsbabel/gpx.cc
@@ -803,7 +803,7 @@ xml_parse_time(const QString& dateTimeString)
   int off_sign = 1;
   char* offsetstr = NULL;
   char* pointstr = NULL;
-  char* timestr = xstrdup(dateTimeString.toUtf8().data());
+  char* timestr = xstrdup(CSTR(dateTimeString));
 
   offsetstr = strchr(timestr, 'Z');
   if (offsetstr) {

diff --git a/gpsbabel/html.cc b/gpsbabel/html.cc
index 35e76638b9ef7740346138109f56f769ef950607..8655cdaaba0e8d96ccd51eb99bfb709961943bf3 100644 (file)
--- a/gpsbabel/html.cc
+++ b/gpsbabel/html.cc
@@ -143,7 +143,7 @@ html_disp(const Waypoint* wpt)
     if (html_encrypt) {
       hint = rot13(wpt->gc_data->hint);
     } else {
-      hint = xstrdup(wpt->gc_data->hint.toUtf8().data());
+      hint = xstrdup(CSTR(wpt->gc_data->hint));
     }
     gbfprintf(file_out, "<p class=\"gpsbabelhint\"><strong>Hint:</strong> %s</p>\n", hint);
     xfree(hint);

diff --git a/gpsbabel/tmpro.cc b/gpsbabel/tmpro.cc
index 19ef9b499c5b92cb82efec00d536dfcd7708c1d4..a7048c88695a84a7cc6300972e6f6ab7fab141e0 100644 (file)
--- a/gpsbabel/tmpro.cc
+++ b/gpsbabel/tmpro.cc
@@ -209,7 +209,7 @@ tmpro_waypt_pr(const Waypoint* wpt)
   if (wpt->HasUrlLink()) {
     // Yes, it's lame to allocate/copy here.
     UrlLink link = wpt->GetUrlLink();
-    l = xstrdup(link.url_.toUtf8().data());
+    l = xstrdup(CSTR(link.url_));
   }
   gbfprintf(file_out, "new\t%.6s\t%.80s\t%08.6f\t%08.6f\t\t\t%.2f\t%d\t%d\t%.128s\n",
             CSTRc(shortname),

diff --git a/gpsbabel/util.cc b/gpsbabel/util.cc
index ada0c5d89f7ac758f7aa2cd66702b5314d5a9c33..076f0bc8792f7869d5b1c1563895fbd1a741f308 100644 (file)
--- a/gpsbabel/util.cc
+++ b/gpsbabel/util.cc
@@ -1168,7 +1168,7 @@ strlower(char* src)
 char*
 rot13(const QString& s)
 {
-  char* result = xstrdup(s.toUtf8().data());
+  char* result = xstrdup(CSTR(s));
   char* cur = result;
   int flip = 1;
   while (cur && *cur) {
@@ -1406,8 +1406,8 @@ strip_nastyhtml(const QString& in)
   char* returnstr, *sp;
   char* lcstr, *lcp;
 
-  sp = returnstr = xstrdup(in.toUtf8().data());
-  lcp = lcstr = strlower(xstrdup(in.toUtf8().data()));
+  sp = returnstr = xstrdup(CSTR(in));
+  lcp = lcstr = strlower(xstrdup(CSTR(in)));
 
   while (lcp = strstr(lcstr, "<body>"), NULL != lcp) {
     sp = returnstr + (lcp - lcstr) ; /* becomes <!   > */